US16879: reconciliate perforce changes to git
